Merge changes from emacs-23 branch
authorChong Yidong <cyd@stupidchicken.com>
Sun, 18 Sep 2011 15:21:57 +0000 (11:21 -0400)
committerChong Yidong <cyd@stupidchicken.com>
Sun, 18 Sep 2011 15:21:57 +0000 (11:21 -0400)
commit90e0a38be8532804e8348845b161d7a40171cd7a
tree39e18c998917dd47132670ff5944f3e441a25da5
parent2996e5a40c8fcde2feb33f0273d365247f59da28
parentbe54de42172f4af1b55230ce3b1adc19f73b2e89
Merge changes from emacs-23 branch
src/ChangeLog
src/xdisp.c